From: Sean Whitton Date: Thu, 20 Nov 2025 18:00:40 +0000 (+0000) Subject: Boost BASE_PURESIZE further X-Git-Tag: archive/raspbian/1%30.2+1-2+rpi1^2~2 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22Programmet/%22http:/www.example.com/cgi/%22https:/%22Programmet?a=commitdiff_plain;h=3c24581da95ca8ad047580f4bf35017b3537e918;p=emacs.git Boost BASE_PURESIZE further Closes: #1121058 --- 3c24581da95ca8ad047580f4bf35017b3537e918 diff --cc debian/.git-dpm index ed1f97173f1,00000000000..acc41306d86 mode 100644,000000..100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@@ -1,8 -1,0 +1,8 @@@ +# see git-dpm(1) from git-dpm package - d4a154eec2184afba41a1f558993427baa57e2d9 - d4a154eec2184afba41a1f558993427baa57e2d9 ++58a19e410fd61f3caed7dd79d5db345492e3fa8a ++58a19e410fd61f3caed7dd79d5db345492e3fa8a +a24283bc41f2e3b3ba14c420f86f7ec581624a82 +a24283bc41f2e3b3ba14c420f86f7ec581624a82 +emacs_30.2+1.orig.tar.xz +5f56965565248d570f1fd86458b57c8a75960ebf +31109076 diff --cc debian/patches/0019-Boost-BASE_PURESIZE-to-fix-build-on-certain-archs.patch index 00000000000,00000000000..80f036bd765 new file mode 100644 --- /dev/null +++ b/debian/patches/0019-Boost-BASE_PURESIZE-to-fix-build-on-certain-archs.patch @@@ -1,0 -1,0 +1,22 @@@ ++From 19510947d4e28d5b952431940bf010365f1aeb13 Mon Sep 17 00:00:00 2001 ++From: Sean Whitton ++Date: Tue, 25 Feb 2025 09:19:38 +0800 ++Subject: Boost BASE_PURESIZE to fix build on certain archs ++ ++--- ++ src/puresize.h | 2 +- ++ 1 file changed, 1 insertion(+), 1 deletion(-) ++ ++diff --git a/src/puresize.h b/src/puresize.h ++index f2576666a66..1dc2bb1585a 100644 ++--- a/src/puresize.h +++++ b/src/puresize.h ++@@ -47,7 +47,7 @@ #define SITELOAD_PURESIZE_EXTRA 0 ++ #endif ++ ++ #ifndef BASE_PURESIZE ++-#define BASE_PURESIZE (3400000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA) +++#define BASE_PURESIZE (5500000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA) ++ #endif ++ ++ /* Increase BASE_PURESIZE by a ratio depending on the machine's word size. */ diff --cc debian/patches/0020-Disable-server-tests-server-force-stop-keeps-frames-.patch index c53ed4f6f63,00000000000..eb1598a1f5c mode 100644,000000..100644 --- a/debian/patches/0020-Disable-server-tests-server-force-stop-keeps-frames-.patch +++ b/debian/patches/0020-Disable-server-tests-server-force-stop-keeps-frames-.patch @@@ -1,27 -1,0 +1,27 @@@ - From f0d610eba21df7de899741b0adbd881d9a1f9d89 Mon Sep 17 00:00:00 2001 ++From 154c04611e509e50a7d1f9b31e84e4f84003d576 Mon Sep 17 00:00:00 2001 +From: Sean Whitton +Date: Wed, 26 Feb 2025 16:13:44 +0800 +Subject: Disable server-tests/server-force-stop/keeps-frames on riscv64 + +This test often hangs on the Debian buildds. +It simply fails on a porterbox, at least for the emacs-nox phase +of the build, though seemingly not the emacs-lucid phase. +--- + test/lisp/server-tests.el | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/test/lisp/server-tests.el b/test/lisp/server-tests.el +index 444c2f99fa7..02106808518 100644 +--- a/test/lisp/server-tests.el ++++ b/test/lisp/server-tests.el +@@ -195,7 +195,9 @@ server-tests/server-force-stop/keeps-frames + tests that `server-force-stop' doesn't delete frames (and even + then, requires a few tricks to run as a regression test). So + long as this works, the problem in bug#58877 shouldn't occur." +- (skip-unless server-tests/can-create-frames-p) ++ (skip-unless (and server-tests/can-create-frames-p ++ (not (string-prefix-p "riscv64-" ++ system-configuration)))) + (let* ((starting-frames (frame-list)) + (starting-frame-count (length starting-frames)) + terminal) diff --cc debian/patches/0021-Disable-emacs-module-tests.el.patch index 45cd451b0a3,00000000000..bbfdb6905a4 mode 100644,000000..100644 --- a/debian/patches/0021-Disable-emacs-module-tests.el.patch +++ b/debian/patches/0021-Disable-emacs-module-tests.el.patch @@@ -1,26 -1,0 +1,26 @@@ - From 53052b6f0a34ddef18a6c3e282f768f9cc9ea0f9 Mon Sep 17 00:00:00 2001 ++From c0d3be6f99bf18892b471b4d4b89268b0d6efe2f Mon Sep 17 00:00:00 2001 +From: Sean Whitton +Date: Sun, 30 Mar 2025 13:24:23 +0800 +Subject: Disable emacs-module-tests.el + +This regularly causes Emacs to FTBFS. +--- + test/Makefile.in | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/test/Makefile.in b/test/Makefile.in +index 842c0517b98..578c05281b4 100644 +--- a/test/Makefile.in ++++ b/test/Makefile.in +@@ -186,11 +186,7 @@ testloadfile = + -l ert ${ert_opts} -l $(testloadfile) \ + $(TEST_RUN_ERT) + +-ifeq (@HAVE_MODULES@, yes) +-maybe_exclude_module_tests := +-else + maybe_exclude_module_tests := -name emacs-module-tests.el -prune -o +-endif + + ## Optional list of .el files to exclude from testing. + ## Intended for use in automated testing where one or more files diff --cc debian/patches/0022-Add-public-interfaces-for-accessing-builtin-package-.patch index 22171427b41,00000000000..e741234abf9 mode 100644,000000..100644 --- a/debian/patches/0022-Add-public-interfaces-for-accessing-builtin-package-.patch +++ b/debian/patches/0022-Add-public-interfaces-for-accessing-builtin-package-.patch @@@ -1,48 -1,0 +1,48 @@@ - From 5ad268f00faac747beadf29c4a6216c678764c30 Mon Sep 17 00:00:00 2001 ++From 3218908d819d215262e94f7061684dcc0b02652f Mon Sep 17 00:00:00 2001 +From: Xiyue Deng +Date: Fri, 20 Jun 2025 21:34:45 -0700 +Subject: Add public interfaces for accessing builtin package info (Bug#78844) + +The following upstream patch has been backported: + + Add public interfaces for accessing builtin package info (Bug#78844) + + * lisp/emacs-lisp/package.el (package-builtin-packages) + (package-builtin-package-version): New functions. + * doc/lispref/package.texi: Add a section 'Package Information' with + documentation for the new functions. + * etc/NEWS: Add entry for 'package-versioned-builtin-packages' and + 'package-builtin-package-version'. + +Origin: upstream, commit 5c75ec6ae52a5b06ad0424ce805f5ea0432b6e90 +Forwarded: not-needed +--- + lisp/emacs-lisp/package.el | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el +index be3b85f3179..82b7520a707 100644 +--- a/lisp/emacs-lisp/package.el ++++ b/lisp/emacs-lisp/package.el +@@ -669,6 +669,21 @@ package-alist + loaded and/or activated, customize `package-load-list'.") + (put 'package-alist 'risky-local-variable t) + ++;;;; Public interfaces for accessing built-in package info ++ ++(defun package-versioned-builtin-packages () ++ "Return a list of all the versioned built-in packages. ++The return value is a list of names of built-in packages represented as ++symbols." ++ (mapcar #'car package--builtin-versions)) ++ ++(defun package-builtin-package-version (package) ++ "Return the version of a built-in PACKAGE given by its symbol. ++The return value is a list of integers representing the version of ++PACKAGE, in the format returned by `version-to-list', or nil if the ++package is built-in but has no version or is not a built-in package." ++ (alist-get package package--builtin-versions)) ++ + ;;;###autoload + (defvar package-activated-list nil + ;; FIXME: This should implicitly include all builtin packages. diff --cc debian/patches/0023-test-lisp-net-shr-tests.el-shr-test-zoom-image-Fix-i.patch index 15db2846edf,00000000000..c16092f22a2 mode 100644,000000..100644 --- a/debian/patches/0023-test-lisp-net-shr-tests.el-shr-test-zoom-image-Fix-i.patch +++ b/debian/patches/0023-test-lisp-net-shr-tests.el-shr-test-zoom-image-Fix-i.patch @@@ -1,38 -1,0 +1,38 @@@ - From 60a4ccd482d6856c7aa1cecf0d9ab2461c27b96d Mon Sep 17 00:00:00 2001 ++From 07ae4bf06cc1a9b2c7ebf270009f4497d8f92426 Mon Sep 17 00:00:00 2001 +From: Eli Zaretskii +Date: Thu, 17 Jul 2025 19:34:50 +0300 +Subject: ; * test/lisp/net/shr-tests.el (shr-test/zoom-image): Fix + (bug#79041). + +(cherry picked from commit 462a541db904405ede8446c48ba0c71ad41c544d) + +README-Debian: The shr-test/zoom image test should now work with libxml2 2.14+ + . + This upstream patch has been added to fix the problem: + . + commit 462a541db904405ede8446c48ba0c71ad41c544d + Author: Eli Zaretskii + Date: Thu Jul 17 19:34:50 2025 +0300 + . + ; * test/lisp/net/shr-tests.el (shr-test/zoom-image): Fix (bug#79041). +Bug: https://debbugs.gnu.org/79041 +Bug-Debian: https://bugs.debian.org/1106354 +--- + test/lisp/net/shr-tests.el | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/lisp/net/shr-tests.el b/test/lisp/net/shr-tests.el +index 8d66684c96d..4978db27df5 100644 +--- a/test/lisp/net/shr-tests.el ++++ b/test/lisp/net/shr-tests.el +@@ -145,8 +145,8 @@ shr-test/zoom-image + (dolist (alt '(nil "" "nothing to see here")) + (with-temp-buffer + (ert-info ((format "image with alt=%S" alt)) +- (let ((attrs (if alt (format " alt=\"%s\"" alt) ""))) +- (insert (format "" alt) ">"))) ++ (insert (format " +Date: Mon, 10 Nov 2025 12:20:23 -0600 +Subject: Mark esh-proc-test/kill-pipeline as unstable for now + +Currently fails on at least s390x from time to time. It doesn't take +long to reproduce via + + (set -ex; while true; do make lisp/eshell/esh-proc-tests EMACS_TEST_VERBOSE=true; done) + +from debian/build-lucid/test/. The failure looks like this: + + passed 3/24 esh-proc-test/exit-status/with-stderr-pipe (0.101971 sec) + Test esh-proc-test/kill-pipeline backtrace: + signal(ert-test-failed (((should (string-match-p (rx bos (32 (or "in + ert-fail(((should (string-match-p (rx bos (32 (or "interrupt" (seq " + (if (unwind-protect (setq value-154 (apply fn-152 args-153)) (setq f + (let (form-description-156) (if (unwind-protect (setq value-154 (app + (let ((value-154 'ert-form-evaluation-aborted-155)) (let (form-descr + (let* ((fn-152 #'string-match-p) (args-153 (condition-case err (list + (let ((output-start (eshell-beginning-of-output))) (eshell-kill-proc + (let ((ert--infos (cons (cons "Command logs: " #'eshell-get-debug-lo + (save-current-buffer (set-buffer eshell-buffer) (let ((ert--infos (c + (unwind-protect (save-current-buffer (set-buffer eshell-buffer) (let + (let ((eshell-buffer (eshell t))) (unwind-protect (save-current-buff + (let ((process-environment (cons "HISTFILE" process-environment)) (e + (progn (let ((process-environment (cons "HISTFILE" process-environme + (unwind-protect (progn (let ((process-environment (cons "HISTFILE" p + (let* ((coding-system-for-write nil) (temp-file (file-name-as-direct + (save-current-buffer (let* ((coding-system-for-write nil) (temp-file + #f(lambda () [t] (let ((value-145 (gensym "ert-form-evaluation-abort + #f(compiled-function () #)() + handler-bind-1(#f(compiled-function () # + ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test + ert-run-test(#s(ert-test :name esh-proc-test/kill-pipeline :document + ert-run-or-rerun-test(#s(ert--stats :selector ... :tests ... :test-m + ert-run-tests((not (or (tag :unstable) (tag :nativecomp))) #f(compil + ert-run-tests-batch((not (or (tag :unstable) (tag :nativecomp)))) + ert-run-tests-batch-and-exit((not (or (tag :unstable) (tag :nativeco + eval((ert-run-tests-batch-and-exit '(not (or (tag :unstable) (tag :n + command-line-1(("-L" ":/home/rlb/emacs/debian/build-src/test" "-l" " + command-line() + normal-top-level() + Test esh-proc-test/kill-pipeline condition: + Command logs: command: "sh -c 'while true; do echo y; sleep 1; done' | sh -c 'while true; do read NAME; done'" + + ---------------------------------------- + [process] started external process `sh' + + /usr/bin/sh -c while\ true\;\ do\ read\ NAME\;\ done + ---------------------------------------- + [process] started external process `sh<1>' + + /usr/bin/sh -c while\ true\;\ do\ echo\ y\;\ sleep\ 1\;\ done + ---------------------------------------- + [process] received output from process `sh<1>' + + y + + ---------------------------------------- + [process] forwarding output from process `sh<1>' + + y + + ---------------------------------------- + [process] sentinel for external process `sh<1>': "killed + " + ---------------------------------------- + [process] i/o busy for process `sh<1>' + ---------------------------------------- + [process] sentinel for external process `sh-stderr': "finished + " + ---------------------------------------- + [process] finished external process `sh-stderr' + ---------------------------------------- + [process] sentinel for external process `sh': "killed + " + ---------------------------------------- + [process] finished external process `sh' + (ert-test-failed + ((should + (string-match-p (rx bos ... eos) + (buffer-substring-no-properties output-start ...))) + :form + (string-match-p "\\`\\(?:\\(?:interrupt\\|killed.*\\)\n\\)?\\'" + "/home/rlb/emacs/debian/build-lucid/test $ sh -c 'while true; do echo y; sleep 1; done' | sh -c 'while true; do read NAME; done'\n") + :value nil)) + FAILED 4/24 esh-proc-test/kill-pipeline (0.003864 sec) at ../../build-src/test/lisp/eshell/esh-proc-tests.el:300 + Error running timer: (error "Selecting deleted buffer") + passed 5/24 esh-proc-test/kill-pipeline-head (0.102912 sec) + passed 6/24 esh-proc-test/kill-process/background-prompt (0.001595 sec) + [sleep]+ Done (/usr/bin/sleep 100) + passed 7/24 esh-proc-test/kill-process/foreground-only (0.203248 sec) + passed 8/24 esh-proc-test/kill-process/redirect-message (0.001616 sec) + passed 9/24 esh-proc-test/output/remote-redirect (0.160153 sec) +--- + test/lisp/eshell/esh-proc-tests.el | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/test/lisp/eshell/esh-proc-tests.el b/test/lisp/eshell/esh-proc-tests.el +index 06a3433cb45..7fadba77f53 100644 +--- a/test/lisp/eshell/esh-proc-tests.el ++++ b/test/lisp/eshell/esh-proc-tests.el +@@ -300,6 +300,10 @@ esh-proc-test/kill-process/redirect-message + (ert-deftest esh-proc-test/kill-pipeline () + "Test that killing a pipeline of processes only emits a single + prompt. See bug#54136." ++ :tags '(:unstable) ++ ;; Sporadically fails on at least s390x. Fairly easy to see via ++ ;; (set -ex; while true; do make lisp/eshell/esh-proc-tests EMACS_TEST_VERBOSE=true; done) ++ ;; run from test/. + (skip-unless (and (executable-find "sh") + (executable-find "echo") + (executable-find "sleep"))) diff --cc debian/patches/series index 4f952538d0f,00000000000..98308a9e429 mode 100644,000000..100644 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,24 -1,0 +1,24 @@@ +0001-Prefer-usr-share-info-emacs.patch +0002-Run-debian-startup-and-set-debian-emacs-flavor.patch +0003-Remove-files-that-appear-to-be-incompatible-with-the.patch +0004-Adjust-documentation-references-for-Debian.patch +0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch +0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch +0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch +0008-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch +0009-pdumper-set-DUMP_RELOC_ALIGNMENT_BITS-1-for-m68k.patch +0010-Mark-test-undo-region-as-unstable.patch +0011-Mark-flaky-test-process-tests-multiple-threads-waiti.patch +0012-Add-inhibit-native-compilation.patch +0013-Rename-to-inhibit-automatic-native-compilation.patch +0014-Patch-project-vc-recognizes-git-test-for-Debian-buil.patch +0015-Change-native-comp-async-jobs-number-default-to-1.patch +0016-Change-native-comp-async-report-warnings-errors-to-s.patch +0017-Mark-dired-test-bug27243-02-as-unstable-for-now.patch +0018-Fix-eldoc-warning-in-patch-adding-debian-emacs-flavo.patch - 0019-Boost-BASE_PURESIZE-in-attempt-to-fix-build-on-32-bi.patch ++0019-Boost-BASE_PURESIZE-to-fix-build-on-certain-archs.patch +0020-Disable-server-tests-server-force-stop-keeps-frames-.patch +0021-Disable-emacs-module-tests.el.patch +0022-Add-public-interfaces-for-accessing-builtin-package-.patch +0023-test-lisp-net-shr-tests.el-shr-test-zoom-image-Fix-i.patch +0024-Mark-esh-proc-test-kill-pipeline-as-unstable-for-now.patch